From: Miles Bader Date: Wed, 8 Oct 2003 05:10:43 +0000 (+0000) Subject: Resolve CVS conflicts X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~25245 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=61180639604377a75d017cc757db996c1d464e8e;p=emacs.git Resolve CVS conflicts --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc05e47016a..cf554e9693f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1900,4 +1900,4 @@ See ChangeLog.10 for earlier changes. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. -;;; arch-tag: 5fcf8004-6f58-452a-b9d6-6950323a19c1 +;;; arch-tag: e39939be-dab3-400e-86f5-0e2701a883c1 diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index e245b31044a..cdf6d2966f3 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -23539,3 +23539,5 @@ See ChangeLog.9 for earlier changes. Copyright (C) 2001, 2002 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. + +;;; arch-tag: 5fcf8004-6f58-452a-b9d6-6950323a19c1